(ftfont_driver): Set ftfont_shape in ftfont_driver only

when both HAVE_M17N_FLT and HAVE_LIBOTF are defined.

diff --git a/src/ftfont.c b/src/ftfont.c
index 316f8f3cf097fbd12a9bfa6fa1e05f9ff282c885..7c8ade894f8766d2cccc00fd98101d53ed46219c 100644 (file)
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -306,11 +306,11 @@ struct font_driver ftfont_driver =
     NULL,
     NULL,
     NULL,
-#ifdef HAVE_M17N_FLT
+#if defined (HAVE_M17N_FLT) && defined (HAVE_LIBOTF)
     ftfont_shape
-#else  /* not HAVE_M17N_FLT */
+#else  /* not (HAVE_M17N_FLT && HAVE_LIBOTF) */
     NULL
-#endif /* not HAVE_M17N_FLT */
+#endif /* not (HAVE_M17N_FLT && HAVE_LIBOTF) */
   };
 
 extern Lisp_Object QCname;